Auto merge of #1934 - steveklabnik:gh1930, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:34:31 +0000 (22:34 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:34:31 +0000 (22:34 +0000)
commitca1b05fd159a19eae2739d563130c159a49ea390
treeb13e747aa767e5c37233d24938a8205eea807fde
parent6404de08fdd3f1d08e5c2d3a793920dc07de9439
parentbdbba3fc69d1817d5d9dcdd2bf8b153356cbe805
Auto merge of #1934 - steveklabnik:gh1930, r=alexcrichton

Fixes #1930